Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow deleting custom lists #5820

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Conversation

rablador
Copy link
Contributor

@rablador rablador commented Feb 15, 2024

It should be possible to delete a custom list.


This change is Reviewable

@rablador rablador added the iOS Issues related to iOS label Feb 15, 2024
Copy link

linear bot commented Feb 15, 2024

@rablador rablador changed the base branch from main to add-ui-for-editing-a-custom-list-ios-513 February 15, 2024 16:29
@rablador rablador force-pushed the add-ui-for-editing-a-custom-list-ios-513 branch from 816c571 to 29f802e Compare February 16, 2024 09:12
@rablador rablador force-pushed the allow-deleting-custom-lists-ios-492 branch from 6c0930e to 0fa069d Compare February 16, 2024 09:14
@rablador rablador force-pushed the add-ui-for-editing-a-custom-list-ios-513 branch 2 times, most recently from 0141ab3 to 4d11f05 Compare February 16, 2024 11:41
@rablador rablador force-pushed the allow-deleting-custom-lists-ios-492 branch from 0fa069d to 5d44827 Compare February 16, 2024 11:51
@rablador rablador force-pushed the add-ui-for-editing-a-custom-list-ios-513 branch from 4d11f05 to 13dbec5 Compare February 16, 2024 12:09
@rablador rablador force-pushed the allow-deleting-custom-lists-ios-492 branch from 5d44827 to bf63d53 Compare February 16, 2024 12:12
@rablador rablador force-pushed the add-ui-for-editing-a-custom-list-ios-513 branch 10 times, most recently from 1da87ee to cd07be0 Compare February 21, 2024 11:08
@buggmagnet buggmagnet force-pushed the add-ui-for-editing-a-custom-list-ios-513 branch from cd07be0 to ed1b81e Compare February 21, 2024 13:57
Base automatically changed from add-ui-for-editing-a-custom-list-ios-513 to main February 21, 2024 14:05
@rablador rablador force-pushed the allow-deleting-custom-lists-ios-492 branch 6 times, most recently from 6e77dc7 to 1189e5f Compare February 28, 2024 10:27
@rablador rablador marked this pull request as ready for review February 28, 2024 10:28
Copy link
Contributor

@buggmagnet buggmagnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving because of no blocking changes

Reviewed 1 of 16 files at r2, 17 of 17 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @rablador)


ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift line 178 at r3 (raw file):

                    title: NSLocalizedString(
                        "CUSTOM_LISTS_DELETE_BUTTON",
                        tableName: "APIAccess",

Shouldn't those table names be different ? (i.e. custom list table names ?)

This message is valid for all localised strings in custom lists

Copy link
Contributor Author

@rablador rablador left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @buggmagnet)


ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift line 178 at r3 (raw file):

Previously, buggmagnet wrote…

Shouldn't those table names be different ? (i.e. custom list table names ?)

This message is valid for all localised strings in custom lists

Yeah, my bad, I'll change it.

@rablador rablador force-pushed the allow-deleting-custom-lists-ios-492 branch 5 times, most recently from 43a5af2 to e3af6b9 Compare March 1, 2024 10:10
Copy link
Collaborator

@mojganii mojganii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 15 of 18 files reviewed, 4 unresolved discussions (waiting on @buggmagnet and @rablador)


ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift line 161 at r4 (raw file):

    private func onDelete() {
        showDeleteAlert()

FMPOV I don't see any point of making function for showDeleteAlert. the body of showDeleteAlert can be put in the onDelete directly


ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift line 171 at r4 (raw file):

                "CUSTOM_LISTS_DELETE_PROMPT",
                tableName: "CustomLists",
                value: "Delete \(subject.value.name)?",

based on the Figma's design it should be Delete custom list “the name of custom list”?

Frame 6.jpg


ios/MullvadVPN/Coordinators/CustomLists/EditCustomListCoordinator.swift line 28 at r4 (raw file):

        navigationController: UINavigationController,
        customListInteractor: CustomListInteractorProtocol,
        customList: CustomList

I think it should be part of interactor.

Copy link
Contributor Author

@rablador rablador left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 15 of 18 files reviewed, 4 unresolved discussions (waiting on @buggmagnet and @mojganii)


ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift line 161 at r4 (raw file):

Previously, mojganii wrote…

FMPOV I don't see any point of making function for showDeleteAlert. the body of showDeleteAlert can be put in the onDelete directly

Done.


ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift line 171 at r4 (raw file):

Previously, mojganii wrote…

based on the Figma's design it should be Delete custom list “the name of custom list”?

Frame 6.jpg

Yeah, but api access methods has a similar view that only says "Delete ". I thought it should be consistent, but perhaps it's better to follow the designs.


ios/MullvadVPN/Coordinators/CustomLists/EditCustomListCoordinator.swift line 28 at r4 (raw file):

Previously, mojganii wrote…

I think it should be part of interactor.

I thought about it, but the custom list supplied to EditCustomListCoordinator is specific to that coordinator only and has no relation to CustomListInteractorProtocol or views where CustomListInteractorProtocal is used.

@rablador rablador force-pushed the allow-deleting-custom-lists-ios-492 branch 2 times, most recently from 4620229 to 627a022 Compare March 4, 2024 15:47
Copy link
Contributor

@buggmagnet buggmagnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r5.
Reviewable status: 16 of 18 files reviewed, 3 unresolved discussions (waiting on @mojganii)


ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift line 171 at r4 (raw file):

Previously, rablador (Jon Petersson) wrote…

Yeah, but api access methods has a similar view that only says "Delete ". I thought it should be consistent, but perhaps it's better to follow the designs.

I just talked to the design team about this, they said "we should follow what the desktop does"
Here included is a screenshot of the desktop.

We can follow the copy at least, if the bold title is too complicated to make, we can skip it for now

Screenshot 2024-03-05 at 13.28.04.png

@rablador rablador force-pushed the allow-deleting-custom-lists-ios-492 branch from 627a022 to 55f1db4 Compare March 5, 2024 14:04
Copy link
Contributor Author

@rablador rablador left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 14 of 19 files reviewed, 3 unresolved discussions (waiting on @buggmagnet and @mojganii)


ios/MullvadVPN/Coordinators/CustomLists/CustomListViewController.swift line 171 at r4 (raw file):

Previously, buggmagnet wrote…

I just talked to the design team about this, they said "we should follow what the desktop does"
Here included is a screenshot of the desktop.

We can follow the copy at least, if the bold title is too complicated to make, we can skip it for now

Screenshot 2024-03-05 at 13.28.04.png

Done.

@rablador rablador force-pushed the allow-deleting-custom-lists-ios-492 branch from 55f1db4 to 1f599ce Compare March 5, 2024 14:19
Copy link
Contributor

@buggmagnet buggmagnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 3 files at r4, 3 of 3 files at r6, all commit messages.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @mojganii)

Copy link
Collaborator

@mojganii mojganii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


ios/MullvadVPN/Coordinators/CustomLists/EditCustomListCoordinator.swift line 28 at r4 (raw file):

Previously, rablador (Jon Petersson) wrote…

I thought about it, but the custom list supplied to EditCustomListCoordinator is specific to that coordinator only and has no relation to CustomListInteractorProtocol or views where CustomListInteractorProtocal is used.

nit: maybe I need to change the place of the dependency.for now let's leave it

@buggmagnet buggmagnet force-pushed the allow-deleting-custom-lists-ios-492 branch from 1f599ce to eb9edc7 Compare March 7, 2024 07:36
@buggmagnet buggmagnet merged commit 7c6c854 into main Mar 7, 2024
6 checks passed
@buggmagnet buggmagnet deleted the allow-deleting-custom-lists-ios-492 branch March 7, 2024 07:41
Copy link

github-actions bot commented Mar 7, 2024

🚨 End to end tests failed. Please check the failed workflow run.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
iOS Issues related to iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants